gitweb / test / file with spaceson commit apply: check D/F conflicts more carefully. (c28c571)
   1This
   2filename
   3contains
   4spaces.